From 30111b19553374b699cf3cd0c8490fc9ab2621b7 Mon Sep 17 00:00:00 2001
From: Daniel Carl <danielcarl@gmx.de>
Date: Mon, 27 May 2013 19:45:02 +0200
Subject: [PATCH] Fixed segfault in :shortcut-add without parameters (#23).
---
src/command.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/command.c b/src/command.c
index 3a77867..0c19df1 100644
--- a/src/command.c
+++ b/src/command.c
@@ -382,11 +382,12 @@ gboolean command_map(const Arg *arg)
vb_set_mode(VB_MODE_NORMAL, false);
- if (arg->s && (key = strchr(arg->s, '='))) {
+ if (!arg->s) {
+ return false;
+ }
+ if ((key = strchr(arg->s, '='))) {
*key = '\0';
- if (arg->s) {
- return keybind_add_from_string(arg->s, key + 1, arg->i);
- }
+ return keybind_add_from_string(arg->s, key + 1, arg->i);
}
return false;
}
@@ -557,7 +558,7 @@ gboolean command_shortcut(const Arg *arg)
if (arg->i) {
char *handle;
- if ((handle = strchr(arg->s, '='))) {
+ if (arg->s && (handle = strchr(arg->s, '='))) {
*handle = '\0';
handle++;
result = shortcut_add(arg->s, handle);
--
2.20.1